From: Eh2406 <YeomanYaacov@gmail.com>
Date: Wed, 14 Feb 2018 16:27:48 +0000 (-0500)
Subject: Merge branch 'conflict_tracking' into links
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~85^2~2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=e8ed405749492c7cc067a3996f42e8c73706f40a;p=cargo.git

Merge branch 'conflict_tracking' into links

# Conflicts:
#	src/cargo/core/resolver/mod.rs
---

e8ed405749492c7cc067a3996f42e8c73706f40a
diff --cc src/cargo/core/resolver/mod.rs
index 9f7068dbc,633ae2560..45a8747b2
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@@ -681,11 -660,10 +679,10 @@@ fn activate_deps_loop<'a>(mut cx: Conte
                     dep.name(), prev_active.len());
              let mut candidates = RemainingCandidates {
                  remaining: RcVecIter::new(Rc::clone(&candidates)),
 -                conflicting_prev_active: HashSet::new(),
 +                conflicting_prev_active: HashMap::new(),
              };
-             conflicting_activations = HashMap::new();
 -            (candidates.next(prev_active),
 -             candidates.clone().next(prev_active).is_ok(),
 +            (candidates.next(prev_active, &cx.links),
 +             candidates.clone().next(prev_active, &cx.links).is_ok(),
               candidates)
          };